Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some backpack sprites for Kepori #3430

Merged
merged 10 commits into from
Oct 6, 2024
Merged

Conversation

thgvr
Copy link
Member

@thgvr thgvr commented Sep 25, 2024

About The Pull Request

image

Changelog

🆑
imageadd: Some backpack sprites for Kepori
/:cl:

@thgvr thgvr requested a review from a team as a code owner September 25, 2024 13:14
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Sep 25, 2024
@thgvr thgvr requested a review from a team as a code owner October 1, 2024 21:48
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Oct 1, 2024
@thgvr thgvr enabled auto-merge October 1, 2024 21:52
@thgvr thgvr added this pull request to the merge queue Oct 2, 2024
@thgvr thgvr removed this pull request from the merge queue due to a manual request Oct 2, 2024
Copy link
Contributor

github-actions bot commented Oct 5, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 5, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 6, 2024
@thgvr thgvr enabled auto-merge October 6, 2024 03:11
@thgvr thgvr added this pull request to the merge queue Oct 6, 2024
Merged via the queue into shiptest-ss13:master with commit ae2ed95 Oct 6, 2024
14 checks passed
@thgvr thgvr deleted the more-kepsprites branch October 6, 2024 03:31
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Oct 6, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

![image](https://github.com/user-attachments/assets/ecfb8832-7b72-4951-93b6-1b62c7c86483)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

:cl:
imageadd: Some backpack sprites for Kepori
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 24, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

![image](https://github.com/user-attachments/assets/ecfb8832-7b72-4951-93b6-1b62c7c86483)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

:cl:
imageadd: Some backpack sprites for Kepori
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant